Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging 4.0 back into main #520

Merged
merged 6 commits into from
Dec 22, 2023
Merged

Merging 4.0 back into main #520

merged 6 commits into from
Dec 22, 2023

Conversation

MikeAlhayek
Copy link
Collaborator

No description provided.

@MikeAlhayek MikeAlhayek merged commit 287a1cc into main Dec 22, 2023
2 checks passed
@MikeAlhayek MikeAlhayek deleted the release/4.0 branch December 22, 2023 15:11
@sebastienros
Copy link
Owner

Release branch merges should not be squashed. Just regular merge commit.

@MikeAlhayek
Copy link
Collaborator Author

I'll make sure we do that for next time.

@sebastienros
Copy link
Owner

I will see if I can fix it. Shouldn't have any impact.

@sebastienros
Copy link
Owner

All done, you might have to pull the repos again since I force pushed 4.0 and 5.0 tags/branches

@MikeAlhayek
Copy link
Collaborator Author

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants